From cb83ee9747d28fcde03a705e2b432b366d5c407a Mon Sep 17 00:00:00 2001 From: dbs Date: Wed, 14 Nov 2007 20:05:15 +0000 Subject: [PATCH] Avoid tempdir trickery for c-apps and use consistent header includes. git-svn-id: svn://svn.open-ils.org/ILS/trunk@8062 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/c-apps/Makefile | 60 ++++++++++------------ Open-ILS/src/c-apps/oils_auth.c | 6 +-- Open-ILS/src/c-apps/oils_cstore.c | 2 +- Open-ILS/src/c-apps/oils_dataloader.c | 4 +- Open-ILS/src/c-apps/oils_event.c | 2 +- Open-ILS/src/c-apps/oils_fetch.c | 6 +-- Open-ILS/src/c-apps/oils_idl-core.c | 2 +- Open-ILS/src/c-apps/oils_utils.c | 4 +- .../src/c-apps/{ => openils}/idl_fieldmapper.h | 0 Open-ILS/src/c-apps/{ => openils}/oils_constants.h | 0 Open-ILS/src/c-apps/{ => openils}/oils_event.h | 0 Open-ILS/src/c-apps/{ => openils}/oils_idl.h | 0 Open-ILS/src/c-apps/{ => openils}/oils_utils.h | 0 13 files changed, 41 insertions(+), 45 deletions(-) rename Open-ILS/src/c-apps/{ => openils}/idl_fieldmapper.h (100%) rename Open-ILS/src/c-apps/{ => openils}/oils_constants.h (100%) rename Open-ILS/src/c-apps/{ => openils}/oils_event.h (100%) rename Open-ILS/src/c-apps/{ => openils}/oils_idl.h (100%) rename Open-ILS/src/c-apps/{ => openils}/oils_utils.h (100%) diff --git a/Open-ILS/src/c-apps/Makefile b/Open-ILS/src/c-apps/Makefile index b854fc850f..c39465cd56 100644 --- a/Open-ILS/src/c-apps/Makefile +++ b/Open-ILS/src/c-apps/Makefile @@ -6,70 +6,66 @@ CFLAGS += -DOSRF_LOG_PARAMS all: liboils_idl.so oils_auth.so oils_cstore.so oils_rstore.so oils_dataloader #all: oils_auth.so -oils_event.o: oils_event.c oils_event.h -oils_utils.o: oils_utils.c oils_utils.h idl_fieldmapper.h +oils_event.o: oils_event.c +oils_utils.o: oils_utils.c oils_auth.o: oils_auth.c -oils_fetch.o: oils_fetch.c oils_utils.h -oils_cstore.o: oils_cstore.c oils_utils.h +oils_fetch.o: oils_fetch.c +oils_cstore.o: oils_cstore.c oils_dataloader.o: oils_dataloader.c oils_dataloader: oils_dataloader.o @echo $@ - $(CC) $(LDLIBS) $(LDFLAGS) -loils_idl -loils_utils oils_dataloader.o -o $(TMP)/$@ + $(CC) $(LDLIBS) $(LDFLAGS) -loils_idl -loils_utils oils_dataloader.o -o $@ oils_cstore.so: oils_cstore.o liboils_utils.so liboils_idl.so @echo $@ - $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -loils_utils -ldbdpgsql oils_cstore.o -o $(TMP)/$@ + $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -loils_utils -ldbdpgsql oils_cstore.o -o $@ -oils_rstore.o: oils_cstore.c oils_utils.h +oils_rstore.o: oils_cstore.c $(CC) $(CFLAGS) -I$(TMP) -DRSTORE -c -o $@ oils_cstore.c oils_rstore.so: oils_rstore.o liboils_utils.so liboils_idl.so @echo $@ - $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -ldbdpgsql oils_rstore.o -o $(TMP)/$@ + $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -ldbdpgsql oils_rstore.o -o $@ oils_fetch.so: oils_fetch.o liboils_utils.so @echo $@ - $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -ldbi -ldbdpgsql -loils_utils oils_fetch.o -o $(TMP)/$@ + $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -ldbi -ldbdpgsql -loils_utils oils_fetch.o -o $@ -oils_idl-core.o: oils_idl-core.c oils_idl.h +oils_idl-core.o: oils_idl-core.c liboils_idl.so: oils_idl-core.o @echo $@ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_idl-core.o -o $@ - cp $@ $(TMP)/ - mkdir -p $(TMP)/openils/ - cp oils_idl.h $(TMP)/openils/ - cp idl_fieldmapper.h $(TMP)/openils/ +# cp $@ $(TMP)/ +# mkdir -p $(TMP)/openils/ +# cp oils_idl.h $(TMP)/openils/ +# cp idl_fieldmapper.h $(TMP)/openils/ oils_auth.so: oils_auth.o liboils_utils.so @echo $@ - $(CC) -shared -W1 $(CFLAGS) $(LDLIBS) $(LDFLAGS) -loils_utils -loils_idl oils_auth.o -o $(TMP)/$@ + $(CC) -shared -W1 $(CFLAGS) $(LDLIBS) $(LDFLAGS) -loils_utils -loils_idl oils_auth.o -o $@ -liboils_utils.so: oils_utils.o oils_event.o oils_constants.h +liboils_utils.so: oils_utils.o oils_event.o @echo $@ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_utils.o oils_event.o -o $@ - cp $@ $(TMP)/ - mkdir -p $(TMP)/openils/ - cp oils_event.h $(TMP)/openils/ - cp oils_utils.h $(TMP)/openils/ - cp oils_constants.h $(TMP)/openils/ +# cp $@ $(TMP)/ +# mkdir -p $(TMP)/openils/ +# cp oils_event.h $(TMP)/openils/ +# cp oils_utils.h $(TMP)/openils/ +# cp oils_constants.h $(TMP)/openils/ install: @echo $@; - cp $(TMP)/oils_auth.so $(LIBDIR)/ + cp oils_auth.so $(LIBDIR)/ #cp $(TMP)/oils_fetch.so $(LIBDIR)/ - cp $(TMP)/oils_cstore.so $(LIBDIR)/ - cp $(TMP)/oils_rstore.so $(LIBDIR)/ - cp $(TMP)/liboils_utils.so $(LIBDIR)/ - cp $(TMP)/liboils_idl.so $(LIBDIR)/ - cp $(TMP)/oils_dataloader $(BINDIR)/ + cp oils_cstore.so $(LIBDIR)/ + cp oils_rstore.so $(LIBDIR)/ + cp liboils_utils.so $(LIBDIR)/ + cp liboils_idl.so $(LIBDIR)/ + cp oils_dataloader $(BINDIR)/ mkdir -p $(INCDIR)/ - cp oils_utils.h $(INCDIR) - cp oils_idl.h $(INCDIR) - cp oils_event.h $(INCDIR) - cp oils_constants.h $(INCDIR) - cp idl_fieldmapper.h $(INCDIR) + cp openils/*.h $(INCDIR)/ clean: @echo $@; diff --git a/Open-ILS/src/c-apps/oils_auth.c b/Open-ILS/src/c-apps/oils_auth.c index 87b4ed9c22..7cc9c0ac9a 100644 --- a/Open-ILS/src/c-apps/oils_auth.c +++ b/Open-ILS/src/c-apps/oils_auth.c @@ -3,9 +3,9 @@ #include "opensrf/osrf_settings.h" #include "objson/object.h" #include "opensrf/log.h" -#include "oils_utils.h" -#include "oils_constants.h" -#include "oils_event.h" +#include "openils/oils_utils.h" +#include "openils/oils_constants.h" +#include "openils/oils_event.h" #define OILS_AUTH_CACHE_PRFX "oils_auth_" diff --git a/Open-ILS/src/c-apps/oils_cstore.c b/Open-ILS/src/c-apps/oils_cstore.c index aeedcc2328..6a5a867d1e 100644 --- a/Open-ILS/src/c-apps/oils_cstore.c +++ b/Open-ILS/src/c-apps/oils_cstore.c @@ -4,7 +4,7 @@ #include "opensrf/utils.h" #include "objson/object.h" #include "opensrf/log.h" -#include "oils_idl.h" +#include "openils/oils_idl.h" #include #include diff --git a/Open-ILS/src/c-apps/oils_dataloader.c b/Open-ILS/src/c-apps/oils_dataloader.c index f44a10a2cb..60f844e827 100644 --- a/Open-ILS/src/c-apps/oils_dataloader.c +++ b/Open-ILS/src/c-apps/oils_dataloader.c @@ -6,8 +6,8 @@ #include -#include "oils_idl.h" -#include "oils_utils.h" +#include "openils/oils_idl.h" +#include "openils/oils_utils.h" #define CSTORE "open-ils.cstore" #define APPNAME "oils_dataloader" diff --git a/Open-ILS/src/c-apps/oils_event.c b/Open-ILS/src/c-apps/oils_event.c index dfb8936e73..135bd40bc1 100644 --- a/Open-ILS/src/c-apps/oils_event.c +++ b/Open-ILS/src/c-apps/oils_event.c @@ -1,4 +1,4 @@ -#include "oils_event.h" +#include "openils/oils_event.h" #include #include #include "opensrf/osrf_settings.h" diff --git a/Open-ILS/src/c-apps/oils_fetch.c b/Open-ILS/src/c-apps/oils_fetch.c index 559ebb8435..4babd2569e 100644 --- a/Open-ILS/src/c-apps/oils_fetch.c +++ b/Open-ILS/src/c-apps/oils_fetch.c @@ -3,9 +3,9 @@ #include "opensrf/osrf_settings.h" #include "objson/object.h" #include "opensrf/log.h" -#include "oils_utils.h" -#include "oils_constants.h" -#include "oils_event.h" +#include "openils/oils_utils.h" +#include "openils/oils_constants.h" +#include "openils/oils_event.h" #include #include diff --git a/Open-ILS/src/c-apps/oils_idl-core.c b/Open-ILS/src/c-apps/oils_idl-core.c index a247446316..1eea838996 100644 --- a/Open-ILS/src/c-apps/oils_idl-core.c +++ b/Open-ILS/src/c-apps/oils_idl-core.c @@ -1,4 +1,4 @@ -#include "oils_idl.h" +#include "openils/oils_idl.h" /* * vim:noet:ts=4: */ diff --git a/Open-ILS/src/c-apps/oils_utils.c b/Open-ILS/src/c-apps/oils_utils.c index 168fc1b022..2f27ac16f8 100644 --- a/Open-ILS/src/c-apps/oils_utils.c +++ b/Open-ILS/src/c-apps/oils_utils.c @@ -1,5 +1,5 @@ -#include "oils_utils.h" -#include "oils_idl.h" +#include "openils/oils_utils.h" +#include "openils/oils_idl.h" osrfHash* oilsInitIDL(char* idl_filename) { diff --git a/Open-ILS/src/c-apps/idl_fieldmapper.h b/Open-ILS/src/c-apps/openils/idl_fieldmapper.h similarity index 100% rename from Open-ILS/src/c-apps/idl_fieldmapper.h rename to Open-ILS/src/c-apps/openils/idl_fieldmapper.h diff --git a/Open-ILS/src/c-apps/oils_constants.h b/Open-ILS/src/c-apps/openils/oils_constants.h similarity index 100% rename from Open-ILS/src/c-apps/oils_constants.h rename to Open-ILS/src/c-apps/openils/oils_constants.h diff --git a/Open-ILS/src/c-apps/oils_event.h b/Open-ILS/src/c-apps/openils/oils_event.h similarity index 100% rename from Open-ILS/src/c-apps/oils_event.h rename to Open-ILS/src/c-apps/openils/oils_event.h diff --git a/Open-ILS/src/c-apps/oils_idl.h b/Open-ILS/src/c-apps/openils/oils_idl.h similarity index 100% rename from Open-ILS/src/c-apps/oils_idl.h rename to Open-ILS/src/c-apps/openils/oils_idl.h diff --git a/Open-ILS/src/c-apps/oils_utils.h b/Open-ILS/src/c-apps/openils/oils_utils.h similarity index 100% rename from Open-ILS/src/c-apps/oils_utils.h rename to Open-ILS/src/c-apps/openils/oils_utils.h -- 2.11.0