X-Git-Url: http://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=xgnokii%2FMakefile;fp=xgnokii%2FMakefile;h=50afb7cd4bf75451b5156604fb37b095baef2485;hp=c3e220b02b460cb05c016f58804060017fb4ed38;hb=49dd905279a8e62936e3713510ab0fd738e20ecb;hpb=2f2703c9133032c12671ca5c77ae626b8fb178d4

diff --git a/xgnokii/Makefile b/xgnokii/Makefile
index c3e220b..50afb7c 100644
--- a/xgnokii/Makefile
+++ b/xgnokii/Makefile
@@ -1,23 +1,31 @@
 
 
 #
+# $Id$
+#
 # Makefile for the xGNOKII tool suite.
 #
+# Copyright (C) 1999 Hugh Blemings & Pavel Janík ml. & Jan Derfinak
+#               2000 Karel Zak
+#
 
 TOPDIR=..
 include $(TOPDIR)/Makefile.global
 
-CFLAGS += -DXGNOKIIDOCSDIR=\"$(docdir)\" \
-	  $(PTHREAD_CFLAGS) \
-	  $(GTK_CFLAGS) 
-
-LDLIBS	+= $(PTHREAD_LIBS) \
-	   $(GTK_LIBS) 
-
 ifdef XPM_LIBS
-    LDLIBS += $(XPM_LIBS)
+    LDFLAGS += $(XPM_LIBS)
+    LDLIBS  += $(XPM_LIBS)
+    CFLAGS  += $(XPM_CFLAGS)
 endif
 
+CFLAGS += $(PTHREAD_CFLAGS) \
+	  $(GTK_CFLAGS)
+
+LDFLAGS += $(PTHREAD_LIBS) \
+	   $(GTK_LIBS)
+LDLIBS  += $(PTHREAD_LIBS) \
+	   $(GTK_LIBS)
+
 OBJS = 	xgnokii.o \
 	xgnokii_common.o \
 	xgnokii_contacts.o \
@@ -29,46 +37,84 @@ OBJS = 	xgnokii.o \
 	xgnokii_xkeyb.o \
 	xgnokii_calendar.o \
 	xgnokii_logos.o \
-	xgnokii_xring.o \
 	xgnokii_lowlevel.o \
 	xgnokii_data.o
 
+HELP_DIR = docs/help
+
+
 all: xgnokii
 
-xgnokii: $(OBJS) $(TOPDIR)/common/COMMON.o $(TOPDIR)/common/DATA.o $(TOPDIR)/common/gsm-filetypes.o
-	$(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
-$(TOPDIR)/common/COMMON.o: 
-	$(MAKE) -C $(TOPDIR)/common COMMON.o
+xgnokii: $(OBJS) $(TOPDIR)/common/gsm-filetypes.o $(TOPDIR)/common/libgnokii.a #$(TOPDIR)/common/data/DATA.o
 
-$(TOPDIR)/common/DATA.o:
-	$(MAKE) -C $(TOPDIR)/common DATA.o
+$(TOPDIR)/common/COMMON.o:
+	$(MAKE) -C $(TOPDIR)/common libgnokii.a
 
-$(TOPDIR)/common/gsm-filetypes.o: 
-	$(MAKE) -C $(TOPDIR)/common gsm-filetypes.o
+#$(TOPDIR)/common/data/DATA.o:
+#	$(MAKE) -C $(TOPDIR)/common/data DATA.o
 
-$(TOPDIR)/common/libmygnokii.so:
-	$(MAKE) -C $(TOPDIR)/common makelib
-	
-xgnokiilib: $(OBJS) $(TOPDIR)/common/libmygnokii.so
-	$(CC) $(LDFLAGS) $(TARGET_ARCH) $(OBJS) -L$(TOPDIR)/common -lmygnokii $(LOADLIBES) $(LDLIBS) -o $@
+$(TOPDIR)/common/gsm-filetypes.o:
+	$(MAKE) -C $(TOPDIR)/common gsm-filetypes.o
 
-makelib: xgnokiilib
-	
 clean:
-	$(RM) $(OBJS) *~ xpm/*~ depend xgnokii xgnokiilib
+	$(RM) $(OBJS) *~ xpm/*~ depend xgnokii
 
 install: all
 	$(INSTALL) -d $(xbindir)
 	$(INSTALL) xgnokii $(xbindir)
-	$(INSTALL) xgnokiilib $(xbindir)/xgnokii
+	$(INSTALL) -d $(xgnokii_libdir)/help
+	( cd $(HELP_DIR); \
+	  $(FIND) . -type d \! -path "*CVS*" \
+	       -exec $(INSTALL) -d $(xgnokii_libdir)/help/{} \; ; \
+	  $(FIND) . -type f \! -path "*CVS*" \
+	       -exec $(INSTALL) -m 0444 {} $(xgnokii_libdir)/help/{} \; \
+	)
+	$(INSTALL) -m 0444 ../Docs/CREDITS $(xgnokii_libdir)/help/en_US
+	$(INSTALL) -m 0444 ../COPYING $(xgnokii_libdir)/help/en_US
+	$(INSTALL) -d $(xgnokii_libdir)/help/en_US/sample
+	$(INSTALL) -m 0444 ../Docs/sample/gnokiirc $(xgnokii_libdir)/help/en_US/sample
+	(cd $(xgnokii_libdir)/help; ln -sf en_US C; ln -sf en_US POSIX)
 	$(INSTALL) -d $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/6110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/6150.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/5110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_6110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_6150.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_6210.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_3310.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_5110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_3210.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_6250.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_7110.xpm $(xgnokii_libdir)/xpm
 
 install-strip: all
 	$(INSTALL) -d $(xbindir)
 	$(INSTALL) -s xgnokii $(xbindir)
-	$(INSTALL) -s xgnokiilib $(xbindir)/xgnokii
+	$(INSTALL) -d $(xgnokii_libdir)/help
+	( cd $(HELP_DIR); \
+	  $(FIND) . -type d \! -path "*CVS*" \
+	       -exec $(INSTALL) -d $(xgnokii_libdir)/help/{} \; ; \
+	  $(FIND) . -type f \! -path "*CVS*" \
+	       -exec $(INSTALL) -m 0444 {} $(xgnokii_libdir)/help/{} \; \
+	)
+	$(INSTALL) -m 0444 ../Docs/CREDITS $(xgnokii_libdir)/help/en_US
+	$(INSTALL) -m 0444 ../COPYING $(xgnokii_libdir)/help/en_US
+	$(INSTALL) -d $(xgnokii_libdir)/help/en_US/sample
+	$(INSTALL) -m 0444 ../Docs/sample/gnokiirc $(xgnokii_libdir)/help/en_US/sample
+	(cd $(xgnokii_libdir)/help; ln -sf en_US C; ln -sf en_US POSIX)
 	$(INSTALL) -d $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/6110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/6150.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/5110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_6110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_6150.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_6210.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_3310.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_5110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_3210.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_6250.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -m 0444 xpm/Preview_7110.xpm $(xgnokii_libdir)/xpm
 	@echo "done"
 
 install-suid: all
@@ -77,8 +123,30 @@ install-suid: all
 	fi
 	$(INSTALL) -d $(xbindir)
 	$(INSTALL) -o root -g gnokii -m 0750 xgnokii $(xbindir)
-	$(INSTALL) -o root -g gnokii -m 0750 xgnokiilib $(xbindir)/xgnokii
+	$(INSTALL) -o root -g gnokii -d -m 0750 $(xgnokii_libdir)/help
+	( cd $(HELP_DIR); \
+	  $(FIND) . -type d \! -path "*CVS*" \
+	       -exec $(INSTALL) -o root -g gnokii -d -m 0750 $(xgnokii_libdir)/help/{} \; ; \
+	  $(FIND) . -type f \! -path "*CVS*" \
+	       -exec $(INSTALL) -o root -g gnokii -m 0440 {} $(xgnokii_libdir)/help/{} \; \
+	)
+	$(INSTALL) -o root -g gnokii -m 0440 ../Docs/CREDITS $(xgnokii_libdir)/help/en_US
+	$(INSTALL) -o root -g gnokii -m 0440 ../COPYING $(xgnokii_libdir)/help/en_US
+	$(INSTALL) -o root -g gnokii -d -m 0750 $(xgnokii_libdir)/help/en_US/sample
+	$(INSTALL) -o root -g gnokii -m 0440 ../Docs/sample/gnokiirc $(xgnokii_libdir)/help/en_US/sample
+	(cd $(xgnokii_libdir)/help; ln -sf en_US C; ln -sf en_US POSIX)
 	$(INSTALL) -o root -g gnokii -d -m 0750 $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/6110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/6150.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/5110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_6110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_6150.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_6210.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_3310.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_5110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_3210.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_6250.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_7110.xpm $(xgnokii_libdir)/xpm
 	@echo
 
 install-ss: all
@@ -87,8 +155,30 @@ install-ss: all
 	fi
 	$(INSTALL) -o root -g gnokii -d $(xbindir)
 	$(INSTALL) -o root -g gnokii -m 0750 -s xgnokii $(xbindir)
-	$(INSTALL) -o root -g gnokii -m 0750 -s xgnokiilib $(xbindir)/xgnokii
+	$(INSTALL) -o root -g gnokii -d -m 0750 $(xgnokii_libdir)/help
+	( cd $(HELP_DIR); \
+	  $(FIND) . -type d \! -path "*CVS*" \
+	       -exec $(INSTALL) -o root -g gnokii -d -m 0750 $(xgnokii_libdir)/help/{} \; ; \
+	  $(FIND) . -type f \! -path "*CVS*" \
+	       -exec $(INSTALL) -o root -g gnokii -m 0440 {} $(xgnokii_libdir)/help/{} \; \
+	)
+	$(INSTALL) -o root -g gnokii -m 0440 ../Docs/CREDITS $(xgnokii_libdir)/help/en_US
+	$(INSTALL) -o root -g gnokii -m 0440 ../COPYING $(xgnokii_libdir)/help/en_US
+	$(INSTALL) -o root -g gnokii -d -m 0750 $(xgnokii_libdir)/help/en_US/sample
+	$(INSTALL) -o root -g gnokii -m 0440 ../Docs/sample/gnokiirc $(xgnokii_libdir)/help/en_US/sample
+	(cd $(xgnokii_libdir)/help; ln -sf en_US C; ln -sf en_US POSIX)
 	$(INSTALL) -o root -g gnokii -d -m 0750 $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/6110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/6150.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/5110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_6110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_6150.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_6210.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_3310.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_5110.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_3210.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_6250.xpm $(xgnokii_libdir)/xpm
+	$(INSTALL) -o root -g gnokii -m 0440 xpm/Preview_7110.xpm $(xgnokii_libdir)/xpm
 	@echo
 
 depend dep: