summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-12-17 19:46:30 (EST)
committer graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-12-17 19:46:30 (EST)
commit23f45a934e9315c8f6f235f614e376771b737621 (patch)
tree6b955908804e285f6299facb4a4e61a5da2a470b
parent1bc689832bccbf7d799a96c185793d6023a4206e (diff)
Move libopkg.c out into the src dir. It shouldn't be part of the library.
git-svn-id: http://opkg.googlecode.com/svn/trunk@499 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
-rw-r--r--configure.ac5
-rw-r--r--libopkg/Makefile.am2
-rw-r--r--libopkg/libopkg.h34
-rw-r--r--libopkg/opkg_cmd.c1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/opkg-cl.c (renamed from libopkg/libopkg.c)7
-rw-r--r--src/opkg-frontend.c28
7 files changed, 9 insertions, 70 deletions
diff --git a/configure.ac b/configure.ac
index 1dbd369..e7c7831 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,12 @@
# Process this file with autoconf to produce a configure script
-AC_INIT(libopkg/libopkg.c)
+AC_INIT([opkg], [0.1.7])
+AC_CONFIG_SRCDIR([libopkg/pkg.c])
AC_CONFIG_AUX_DIR([conf])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([shave])
-AM_INIT_AUTOMAKE([opkg], [0.1.7])
+AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(libopkg/config.h)
AC_CANONICAL_HOST
diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
index 9e6608b..a55d0b7 100644
--- a/libopkg/Makefile.am
+++ b/libopkg/Makefile.am
@@ -5,7 +5,7 @@ libopkg_includedir=$(includedir)/libopkg
libopkg_include_HEADERS= *.h
-opkg_libcore_sources = args.c args.h libopkg.c libopkg.h\
+opkg_libcore_sources = args.c args.h \
includes.h \
opkg.c opkg.h \
opkg_defines.h
diff --git a/libopkg/libopkg.h b/libopkg/libopkg.h
deleted file mode 100644
index 01ce6f0..0000000
--- a/libopkg/libopkg.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* opkglib.h - the opkg package management system
-
- Florian Boor <florian.boor@kernelconcepts.de>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-*/
-
-#ifndef OPKGLIB_H
-#define OPKGLIB_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include "opkg_conf.h"
-#include "opkg_message.h"
-#include "opkg_download.h"
-#include "opkg_utils.h"
-
-#include "args.h"
-#include "pkg.h"
-
-extern int opkg_op(int argc, char *argv[]); /* opkglib.c */
-
-#endif
diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index a335590..2107fc4 100644
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -38,7 +38,6 @@
#include "opkg_upgrade.h"
#include "opkg_remove.h"
#include "opkg_configure.h"
-#include "libopkg.h"
#include "xsystem.h"
static void
diff --git a/src/Makefile.am b/src/Makefile.am
index d078060..efdc19d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
AM_CFLAGS = -I${top_srcdir}/libopkg ${ALL_CFLAGS}
bin_PROGRAMS = opkg-cl
-opkg_cl_SOURCES = opkg-frontend.c
+opkg_cl_SOURCES = opkg-cl.c
opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
$(top_builddir)/libbb/libbb.la
diff --git a/libopkg/libopkg.c b/src/opkg-cl.c
index d86be9e..74c82e6 100644
--- a/libopkg/libopkg.c
+++ b/src/opkg-cl.c
@@ -1,4 +1,4 @@
-/* opkglib.c - the opkg package management system
+/* opkg-cl.c - the opkg package management system
Florian Boor
@@ -13,6 +13,8 @@
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
+
+ opkg command line frontend using libopkg
*/
#include "includes.h"
@@ -25,9 +27,8 @@
#include "opkg_message.h"
-/* This is used for backwards compatibility */
int
-opkg_op (int argc, char *argv[])
+main(int argc, char *argv[])
{
int opts;
char *cmd_name;
diff --git a/src/opkg-frontend.c b/src/opkg-frontend.c
deleted file mode 100644
index 5afb5b9..0000000
--- a/src/opkg-frontend.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* opkg-frontend.c - the itsy package management system
-
- Florian Boor
-
- Copyright (C) 2003 kernel concepts
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- opkg command line frontend using libopkg
-
-*/
-
-#include <libopkg.h>
-
-/* This is really small, eh? ;-) */
-
-int main(int argc, char *argv[])
-{
- return opkg_op(argc,argv);
-}