diff --git a/src/zmapApp/makefile b/src/zmapApp/makefile index f32d31d75c010dcd5bbf09e6797ecedeab3ea937..9fa207e132dd09101357d0b39a04a2a68f91ea67 100755 --- a/src/zmapApp/makefile +++ b/src/zmapApp/makefile @@ -7,6 +7,7 @@ APP_PRIV_HDRS = zmapApp_P.h APP_SRC = zmapAppwindow.c zmapAppmenubar.c zmapAppmanage.c zmapAppconnect.c APP_OBJ = zmapAppwindow.o zmapAppmenubar.o zmapAppmanage.o zmapAppconnect.o +APP_CC_MAIN_SRC = zmapAppmain_c.c APP_CC_MAIN_OBJ = zmapAppmain_c.o APP_CCC_MAIN_OBJ = zmapAppmain_C.o APP_EXE = zmap zmapC @@ -17,7 +18,7 @@ APP_EXE = zmap zmapC CURRENT_LIB = $(ZMAPAPP_LIB) CURRENT_OBJ = $(APP_OBJ) CURRENT_DEP = $(PUB_HDRS) $(APP_PRIV_HDRS) -CURRENT_SRC = $(APP_PRIV_HDRS) $(APP_SRC) +CURRENT_SRC = $(APP_PRIV_HDRS) $(APP_SRC) $(APP_CC_MAIN_SRC) CURRENT_REMOVE = cd $(BINDIR) ; rm -f $(APP_EXE) $(APP_CC_MAIN_OBJ) $(APP_CCC_MAIN_OBJ) # @@ -42,9 +43,12 @@ ACECONN_LIB_FLAGS = -L$(ACECONN_LIB_DIR) -lAceConn -lmd5 zmap: $(APP_CC_MAIN_OBJ) $(ZMAPAPP_LIB) $(ZMAP_LIB) - $(CC) -g -pthread -o $(BINDIR)/$@ `gtk-config --libs` $(BINDIR)/zmapAppmain_c.o $(ZMAP_LIB_FLAGS) $(ACECONN_LIB_FLAGS) + $(CC) -g -pthread -o $(BINDIR)/$@ `$(PACKAGE_CONFIG) --libs glib-2.0 gtk+-2.0` $(BINDIR)/zmapAppmain_c.o $(ZMAP_LIB_FLAGS) $(ACECONN_LIB_FLAGS) @echo 'zmap (C version) make...' +# $(CC) -g -pthread -o $(BINDIR)/$@ `gtk-config --libs` $(BINDIR)/zmapAppmain_c.o $(ZMAP_LIB_FLAGS) $(ACECONN_LIB_FLAGS) +# @echo 'zmap (C version) make...' + zmapC: $(APP_CCC_MAIN_OBJ) $(ZMAPAPP_LIB) $(ZMAP_LIB) $(CCC) -g -pthread -o $(BINDIR)/$@ `gtk-config --libs` $(BINDIR)/zmapAppmain_c.o $(ZMAP_LIB_FLAGS) $(ACECONN_LIB_FLAGS) @echo 'zmap (C++ version) make...'