opkg: catch up with removals and fix include statement in opkg-frontend.c

git-svn-id: http://opkg.googlecode.com/svn/trunk@44 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..535171da292f73ae5ddf6b18dc3922215799edd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2008-02-29     Michael Lauer   <mickey@openmoko.org>
+
+       * src/opkg-frontend.c: fix include statement to make it build again
+       * many files: remove autogenerated stuff and familiar directory

diff --git a/Makefile.am b/Makefile.am
index ca1d085a7dea122240295454be1a74b5775f65c2..3550b7de3ca626f51c5dbdb243969602fbed2eb1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = familiar libbb libopkg tests src
+SUBDIRS = libbb libopkg tests src

 
 HOST_CPU=@host_cpu@
 BUILD_CPU=@build_cpu@
 
 HOST_CPU=@host_cpu@
 BUILD_CPU=@build_cpu@


@@ -26,4 +26,4 @@ MAINTAINERCLEANFILES= \
        aclocal.m4
 
 package: all-recursive
        aclocal.m4
 
 package: all-recursive

-       STRIPPROG=$(STRIP) familiar/rules INSTALL=$$PWD/install-sh  binary-arch
+       STRIPPROG=$(STRIP) INSTALL=$$PWD/install-sh  binary-arch

diff --git a/configure.ac b/configure.ac
index e36b66486d428344ca8af9e3aff5c9d4e2407e85..117253b1b618ec1d44b3e5853810efd3ab6708e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -131,11 +131,6 @@ AC_OUTPUT(
     libopkg/Makefile
     tests/Makefile
     src/Makefile
     libopkg/Makefile
     tests/Makefile
     src/Makefile

-    familiar/Makefile
-    familiar/control
-    familiar/control-unstripped
-    familiar/libopkg-control
-    familiar/libopkg-dev-control

     libbb/Makefile
     libopkg.pc
     opkg.h)
     libbb/Makefile
     libopkg.pc
     opkg.h)

diff --git a/src/opkg-frontend.c b/src/opkg-frontend.c
index 08a3e4988f6d44a0762d5351a2f8a0a4c50d48ed..e248a6e31527bcd3d445b2114edbe7f8aa37c04b 100644 (file)
--- a/src/opkg-frontend.c
+++ b/src/opkg-frontend.c
@@ -18,7 +18,7 @@
    
 */
 
    
 */
 

-#include <libopkg/libopkg.h>
+#include <libopkg.h>

 
 /* This is really small, eh? ;-) */
 
 
 /* This is really small, eh? ;-) */