dslinux/user/pixil/sys/pixilwm Makefile applets.c

[amadeus]

Update of /cvsroot/dslinux/dslinux/user/pixil/sys/pixilwm
In directory antilope:/tmp/cvs-serv29914/user/pixil/sys/pixilwm

Modified Files:
	Makefile applets.c 
Log Message:
start pixil integration in DSLINUX

Index: applets.c
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/sys/pixilwm/applets.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- applets.c	3 Oct 2006 11:27:09 -0000	1.1
+++ applets.c	8 Oct 2006 21:17:09 -0000	1.2
@@ -46,6 +46,13 @@
 #include "config.h"
 #include "applets.h"
 
+#if 1	// xAMADEUS
+#define dlopen(x,y) 0
+#define dlsym(x,y)  0
+#define dlclose(x)  0
+#define dlerror()   0
+#endif
+
 static int g_applet_id = 0;
 static int g_timer_id = 0;
 

Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/sys/pixilwm/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	8 Oct 2006 12:15:29 -0000	1.2
+++ Makefile	8 Oct 2006 21:17:08 -0000	1.3
@@ -8,13 +8,19 @@
 INSTALL_SODIR=$(INSTALL_DIR)/share/pixilwm
 TARGET=pixilwm
 
+ifeq ($(EN_SHARED),--enable-shared)
+LIBTYPE=.so
+else
+LIBTYPE=.o
+endif
+
 # These are extra targets that are defined locally
 
-TARGET_EXTRAS += applets/date.so
+TARGET_EXTRAS += applets/date$(LIBTYPE)
 
 ifeq ($(CONFIG_PIXILWM_PM),y)
-TARGET_EXTRAS += applets/backlight.so
-TARGET_EXTRAS += applets/battery.so
+TARGET_EXTRAS += applets/backlight$(LIBTYPE)
+TARGET_EXTRAS += applets/battery$(LIBTYPE)
 endif
 
 INSTALL_EXTRAS=inst_applets
@@ -49,9 +55,10 @@
 LIBS+=-lpar
 endif
 
+ifeq ($(EN_SHARED),--enable-shared)
 LIBS+=-ldl
-BUILD_CFLAGS=-export-dynamic
-#BUILD_CFLAGS=-rdynamic
+BUILD_CFLAGS=-rdynamic
+endif
 
 CLEAN_EXTRAS=clean_themes
 
@@ -77,6 +84,3 @@
 
 applets/date.so: applets/date.o
 	$(CC) -shared -o $@ $<
-
-
-